Removed conflict markers.

diff --git a/ChangeLog b/ChangeLog
index cc6cf7189ea7f9364b17157d8c4206f95a51fafe..e1d6658d3b8d8ce6782f51372afe9e335a1788c0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -173,7 +173,6 @@ Thu Jan 22 18:45:26 2004  Owen Taylor  <otaylor@redhat.com>
 
        * NEWS: Organized, added some names.
 
->>>>>>> 1.4833
 Thu Jan 22 16:59:36 2004  Jonathan Blandford  <jrb@gnome.org>
 
        * gtk/gtkliststore.c (gtk_list_store_reorder): Doc fix.

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index cc6cf7189ea7f9364b17157d8c4206f95a51fafe..e1d6658d3b8d8ce6782f51372afe9e335a1788c0 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -173,7 +173,6 @@ Thu Jan 22 18:45:26 2004  Owen Taylor  <otaylor@redhat.com>
 
        * NEWS: Organized, added some names.
 
->>>>>>> 1.4833
 Thu Jan 22 16:59:36 2004  Jonathan Blandford  <jrb@gnome.org>
 
        * gtk/gtkliststore.c (gtk_list_store_reorder): Doc fix.

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index cc6cf7189ea7f9364b17157d8c4206f95a51fafe..e1d6658d3b8d8ce6782f51372afe9e335a1788c0 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -173,7 +173,6 @@ Thu Jan 22 18:45:26 2004  Owen Taylor  <otaylor@redhat.com>
 
        * NEWS: Organized, added some names.
 
->>>>>>> 1.4833
 Thu Jan 22 16:59:36 2004  Jonathan Blandford  <jrb@gnome.org>
 
        * gtk/gtkliststore.c (gtk_list_store_reorder): Doc fix.

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index cc6cf7189ea7f9364b17157d8c4206f95a51fafe..e1d6658d3b8d8ce6782f51372afe9e335a1788c0 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -173,7 +173,6 @@ Thu Jan 22 18:45:26 2004  Owen Taylor  <otaylor@redhat.com>
 
        * NEWS: Organized, added some names.
 
->>>>>>> 1.4833
 Thu Jan 22 16:59:36 2004  Jonathan Blandford  <jrb@gnome.org>
 
        * gtk/gtkliststore.c (gtk_list_store_reorder): Doc fix.

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index cc6cf7189ea7f9364b17157d8c4206f95a51fafe..e1d6658d3b8d8ce6782f51372afe9e335a1788c0 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -173,7 +173,6 @@ Thu Jan 22 18:45:26 2004  Owen Taylor  <otaylor@redhat.com>
 
        * NEWS: Organized, added some names.
 
->>>>>>> 1.4833
 Thu Jan 22 16:59:36 2004  Jonathan Blandford  <jrb@gnome.org>
 
        * gtk/gtkliststore.c (gtk_list_store_reorder): Doc fix.